Improve CMake behavior on Unix and macOS #66369
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Code: Build
|
Going to try making |
I'm not sure when exactly this became a problem, but msgfmt expects its output directory to exist, which includes LC_MESSAGES and CMake wasn't doing that. This should also correct a CI failure for CMake. My guess is this issue went unnoticed for a bit since if the LC_MESSAGES directory was previously created (e.g., by running lang/update_pot.sh) it tends to stay around until you do a fresh clone of the repo.
|
I'm confident enough that this should be good to merge despite the flaked CI failure stopping the CMake job from actually running. |
The CMake job is already broken from the last CMake PR. Let's make certain it works this time |
Yeaaaaah, you're right. My impatience was just getting to me. 🙃 |
14 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
None
Purpose of change
I noticed a few build and install issues popping up after #65822 for me on macOS. Namely:
-DUSE_PREFIX_DATA_DIR=Yesbecause... okay, I'm not sure why but stuff would be installed to/usr/localinstead of within/usr/local/share/cataclysm-ddaas you might expect.Describe the solution
CMAKE_INSTALL_DATAROOTDIRto include the/share/cataclysm-ddasuffix when building withUSE_PREFIX_DATA_DIR. I'm uncertain if this is the ideal solution—@alef, do you know?Describe alternatives you've considered
Testing
Stuff builds and installs in the right location. I'm hoping CI will catch any other obvious issues...
Additional context